Merge branch 'upstream'
authorBernd Zeimetz <bernd@bzed.de>
Sun, 2 May 2010 11:28:45 +0000 (13:28 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Sun, 2 May 2010 11:28:45 +0000 (13:28 +0200)
commitfd47701698c06e033d6dbe24550efe5a9b408cac
treef98e47ba6327bf6bc505df7db0bbec22e118cd8f
parent5f34018025ad1da053882b8b5140e2e30ecd062c
parent05ad24ecfb9af51145cb21c278c7ecede8280ce7
Merge branch 'upstream'